Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Mon, 22 May 2017 18:14:57 +0000 (14:14 -0400)
committerTom Rini <[email protected]>
Mon, 22 May 2017 18:14:57 +0000 (14:14 -0400)

Trivial merge